befd59491fd04261d0f9e7860916bdfbffeace19
[openwrt/openwrt.git] /
1 From 71261ca81b491a4c3b08690347c12e96a75ad0d0 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Sun, 17 Mar 2013 00:55:04 +0100
4 Subject: [PATCH 3/5] wifi: rt2x00: Add support for loading EEPROM from MTD
5
6 Add support for loading EEPROM from MTD.
7
8 Signed-off-by: John Crispin <blogic@openwrt.org>
9 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
10 ---
11 drivers/net/wireless/ralink/rt2x00/Kconfig | 1 +
12 .../net/wireless/ralink/rt2x00/rt2x00eeprom.c | 66 +++++++++++++++++++
13 2 files changed, 67 insertions(+)
14
15 --- a/drivers/net/wireless/ralink/rt2x00/Kconfig
16 +++ b/drivers/net/wireless/ralink/rt2x00/Kconfig
17 @@ -220,6 +220,7 @@ config RT2800SOC
18 select RT2X00_LIB_EEPROM
19 select RT2800_LIB
20 select RT2800_LIB_MMIO
21 + select MTD if SOC_RT288X || SOC_RT305X
22 help
23 This adds support for Ralink WiSoC devices.
24 Supported chips: RT2880, RT3050, RT3052, RT3350, RT3352.
25 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c
26 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c
27 @@ -11,10 +11,66 @@
28 #include <linux/kernel.h>
29 #include <linux/module.h>
30 #include <linux/of.h>
31 +#if IS_ENABLED(CONFIG_MTD)
32 +#include <linux/mtd/mtd.h>
33 +#include <linux/mtd/partitions.h>
34 +#endif
35
36 #include "rt2x00.h"
37 #include "rt2x00soc.h"
38
39 +#if IS_ENABLED(CONFIG_MTD)
40 +static int rt2800lib_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
41 +{
42 + struct device_node *np = rt2x00dev->dev->of_node, *mtd_np = NULL;
43 + int size, offset = 0;
44 + struct mtd_info *mtd;
45 + const char *part;
46 + const __be32 *list;
47 + phandle phandle;
48 + size_t retlen;
49 + int ret;
50 +
51 + list = of_get_property(np, "ralink,mtd-eeprom", &size);
52 + if (!list)
53 + return -ENOENT;
54 +
55 + phandle = be32_to_cpup(list++);
56 + if (phandle)
57 + mtd_np = of_find_node_by_phandle(phandle);
58 + if (!mtd_np) {
59 + dev_err(rt2x00dev->dev, "failed to load mtd phandle\n");
60 + return -EINVAL;
61 + }
62 +
63 + part = of_get_property(mtd_np, "label", NULL);
64 + if (!part)
65 + part = mtd_np->name;
66 +
67 + mtd = get_mtd_device_nm(part);
68 + if (IS_ERR(mtd)) {
69 + dev_err(rt2x00dev->dev, "failed to get mtd device \"%s\"\n", part);
70 + return PTR_ERR(mtd);
71 + }
72 +
73 + if (size > sizeof(*list))
74 + offset = be32_to_cpup(list);
75 +
76 + ret = mtd_read(mtd, offset, rt2x00dev->ops->eeprom_size,
77 + &retlen, (u_char *)rt2x00dev->eeprom);
78 + put_mtd_device(mtd);
79 +
80 + if (ret || retlen != rt2x00dev->ops->eeprom_size) {
81 + dev_err(rt2x00dev->dev, "failed to load eeprom from device \"%s\"\n", part);
82 + return ret;
83 + }
84 +
85 + dev_info(rt2x00dev->dev, "loaded eeprom from mtd device \"%s\"\n", part);
86 +
87 + return ret;
88 +}
89 +#endif
90 +
91 static const char *
92 rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
93 {
94 @@ -74,6 +130,14 @@ err_exit:
95
96 int rt2x00lib_read_eeprom(struct rt2x00_dev *rt2x00dev)
97 {
98 + int ret;
99 +
100 +#if IS_ENABLED(CONFIG_MTD)
101 + ret = rt2800lib_read_eeprom_mtd(rt2x00dev);
102 + if (!ret)
103 + return 0;
104 +#endif
105 +
106 return rt2x00lib_read_eeprom_file(rt2x00dev);
107 }
108 EXPORT_SYMBOL_GPL(rt2x00lib_read_eeprom);